From 4cb346f848a1e0748b03582e91c29c7e757ecb0a Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@xensource.com>
Date: Mon, 2 Jul 2007 08:42:13 +0100
Subject: [PATCH] Fix 15435:ab95b9764b20.

The changeset did not consider about ":cdrom" and "ioemu:"
of a disk definition.

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
---
 tools/python/xen/xend/XendConfig.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py
index 16ebea6f09..17628f337a 100644
--- a/tools/python/xen/xend/XendConfig.py
+++ b/tools/python/xen/xend/XendConfig.py
@@ -936,6 +936,13 @@ class XendConfig(dict):
         return sxpr    
     
     def _blkdev_name_to_number(self, dev):
+        if 'ioemu:' in dev:
+            _, dev = dev.split(':', 1)
+        try:
+            dev, _ = dev.split(':', 1)
+        except ValueError:
+            pass
+        
         try:
             devid = int(dev)
         except ValueError:
-- 
2.30.2